updated from 1.18 -> 1.20  2013-02-12